From 288909d466b72f39906599e39fe92c1f8721cec7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Mar 2002 17:04:32 +0000 Subject: [PATCH] Improve test to prevent infinite loop. (#74952, Thomas Leonard) Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite loop. (#74952, Thomas Leonard) * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): Fix warning when toplevel menu shell isn't a menu bar. (Thomas Leonard, #75602) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkentry.c | 3 ++- gtk/gtkmenushell.c | 7 ++++++- 8 files changed, 62 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ebb3bbb4e1..6213322040 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Wed Mar 20 11:32:07 2002 Owen Taylor + + * gtk/gtkentry.c: Improve test to prevent infinite + loop. (#74952, Thomas Leonard) + + * gtk/gtkmenushell.c (gtk_real_menu_shell_cycle_focus): + Fix warning when toplevel menu shell isn't a menu + bar. (Thomas Leonard, #75602) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 00d67cbdd9..c9d6d18fc2 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -2214,7 +2214,8 @@ gtk_entry_real_activate (GtkEntry *entry) if (window && widget != window->default_widget && - !(!window->default_widget && widget == window->focus_widget)) + !(widget == window->focus_widget && + (!window->default_widget || !GTK_WIDGET_SENSITIVE (window->default_widget)))) gtk_window_activate_default (window); } } diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 3c88397894..dac8ed4db1 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -1128,7 +1128,12 @@ gtk_real_menu_shell_cycle_focus (GtkMenuShell *menu_shell, GtkDirectionType dir) { while (menu_shell && !GTK_IS_MENU_BAR (menu_shell)) - menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell); + { + if (menu_shell->parent_menu_shell) + menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell); + else + menu_shell = NULL; + } if (menu_shell) _gtk_menu_bar_cycle_focus (GTK_MENU_BAR (menu_shell), dir); -- 2.30.2